fix: Linux packaging — copy desktop/icons for non-AppImage builds, prevent set -e exit#10878
Open
BenJule wants to merge 2 commits into
Open
fix: Linux packaging — copy desktop/icons for non-AppImage builds, prevent set -e exit#10878BenJule wants to merge 2 commits into
BenJule wants to merge 2 commits into
Conversation
BuildLinuxImage.sh.in only populated package/ with the binary and resources; the .desktop file and hicolor icons were only added later by build_appimage.sh. When packaging scripts (build_deb.sh, build_rpm.sh) run without a prior AppImage build they would fail trying to read a missing BambuStudio.desktop. Always copy the source .desktop and sized PNGs so system packages work regardless of whether the AppImage step runs.
FOUND_GTK3 grep returns exit code 1 in a fresh container where gtk3 is not yet installed, causing BuildLinux.sh -ur to abort immediately.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two small Linux packaging fixes:
1. Copy desktop file and icons into
build/package/for non-AppImage builds (src/platform/unix/BuildLinuxImage.sh.in)The
installstep was only run when building an AppImage. For.deb/ container builds that skip the AppImage step,BambuStudio.desktopand the icon tree were missing frombuild/package/, causing packaging scripts to fail. The install step is now always run unconditionally.2. Prevent
set -efrom exiting when GTK3 is not yet installed (linux.d/debian)dpkg -l libgtk* | grep gtk-3-devexits with code 1 when the package is not installed, which combined withset -ewould abort the script before the dependency-installation path is reached. Fixed by appending|| echo ''so the expression always succeeds.